From 2cea4de176ea6a93b967fe782aa7ba71934d3691 Mon Sep 17 00:00:00 2001
From: Biao Zhu <zhumouren0623@qq.com>
Date: Sat, 27 Sep 2025 11:12:00 +0800
Subject: [PATCH] fluent-bit: update to 4.1.0

- Remove obsolete patch

Build system: aarch64
Build-tested: mediatek/filogic
Run-tested: mediatek/filogic

Signed-off-by: Biao Zhu <zhumouren0623@qq.com>
---
 admin/fluent-bit/Makefile                     |  4 +-
 ...NPN-with-ALPN-for-client-connections.patch | 54 -------------------
 2 files changed, 2 insertions(+), 56 deletions(-)
 delete mode 100644 admin/fluent-bit/patches/100-tls-replace-NPN-with-ALPN-for-client-connections.patch

diff --git a/admin/fluent-bit/Makefile b/admin/fluent-bit/Makefile
index c9e1fc0c39..1fd0f9cb41 100644
--- a/admin/fluent-bit/Makefile
+++ b/admin/fluent-bit/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fluent-bit
-PKG_VERSION:=4.0.9
+PKG_VERSION:=4.1.0
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/fluent/fluent-bit.git
 PKG_SOURCE_VERSION=v$(PKG_VERSION)
-PKG_MIRROR_HASH:=3826f4d1c37a9aee45db5f4e13f0779e5ab23638993009b24b524ec7be05096f
+PKG_MIRROR_HASH:=37c8e452cb2b492eb364bad350ebe2675e413e1bf83e8ca3e4607ade1084fb71
 
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
diff --git a/admin/fluent-bit/patches/100-tls-replace-NPN-with-ALPN-for-client-connections.patch b/admin/fluent-bit/patches/100-tls-replace-NPN-with-ALPN-for-client-connections.patch
deleted file mode 100644
index 36f3e4580f..0000000000
--- a/admin/fluent-bit/patches/100-tls-replace-NPN-with-ALPN-for-client-connections.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 1d8ae53900e27a28fa31adb7f71f235ce919bafc Mon Sep 17 00:00:00 2001
-From: Biao Zhu <zhumouren0623@qq.com>
-Date: Tue, 2 Sep 2025 23:45:31 +0800
-Subject: [PATCH] tls: replace NPN with ALPN for client connections
-
-Signed-off-by: Biao Zhu <zhumouren0623@qq.com>
----
- src/tls/openssl.c | 28 +++++++++-------------------
- 1 file changed, 9 insertions(+), 19 deletions(-)
-
---- a/src/tls/openssl.c
-+++ b/src/tls/openssl.c
-@@ -198,21 +198,6 @@ static int tls_context_server_alpn_selec
-     return result;
- }
- 
--static int tls_context_client_alpn_select_callback(SSL *ssl,
--                                                   unsigned char **out,
--                                                   unsigned char *outlen,
--                                                   const unsigned char *in,
--                                                   unsigned int inlen,
--                                                   void *arg)
--{
--    return tls_context_server_alpn_select_callback(ssl,
--                                                   (const unsigned char **) out,
--                                                   outlen,
--                                                   in,
--                                                   inlen,
--                                                   arg);
--}
--
- int tls_context_alpn_set(void *ctx_backend, const char *alpn)
- {
-     size_t              wire_format_alpn_index;
-@@ -283,10 +268,15 @@ int tls_context_alpn_set(void *ctx_backe
-                 ctx);
-         }
-         else {
--            SSL_CTX_set_next_proto_select_cb(
--                ctx->ctx,
--                tls_context_client_alpn_select_callback,
--                ctx);
-+            if (ctx->alpn == NULL) {
-+                return -1;
-+            }
-+            if (SSL_CTX_set_alpn_protos(
-+                ctx->ctx, 
-+                (const unsigned char *) &ctx->alpn[1], 
-+                (unsigned int) ctx->alpn[0]) != 0) {
-+                return -1;
-+            }
-         }
-     }
- 
-- 
2.30.2